From cf9746bb8346350446ae8f3fdf026e2b6da50222 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Sun, 10 Oct 2021 14:42:24 +0100 Subject: [PATCH] javadoc-optional Gemeinsame Unterverzeichnisse: odk-old/config und odk/config. Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs. Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples. Gemeinsame Unterverzeichnisse: odk-old/config und odk/config. Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs. Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples. Gbp-Pq: Name javadoc-optional.diff --- Repository.mk | 2 +- configure.ac | Bin 514768 -> 515487 bytes odk/CustomTarget_check.mk | 2 +- odk/Module_odk.mk | 6 ++++-- odk/util/check.pl | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Repository.mk b/Repository.mk index b05d9772bcf..61a136129f9 100644 --- a/Repository.mk +++ b/Repository.mk @@ -859,7 +859,7 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\ offapi_idl \ udkapi_idl \ $(if $(ENABLE_JAVA), \ - odk_javadoc \ + $(if $(JAVADOC),odk_javadoc) \ odk_uno_loader_classes \ ) \ )) diff --git a/configure.ac b/configure.ac index bf81cac0e962cb77232f77feb7fcabe17a3dca45..0ab52eb5d949892e83d34c9e67d4061388095560 100644 GIT binary patch delta 616 zcmcbxRet_%`Gzfw+;O~I3P2E@l~|UTlAk`#S5r@dQ2>%vN}{)AtkdoF)1gtSRp+%FSRJKBr`uxAwNyQ-^E)2rdV?NfmlY( z=`#L|#&FYK#xSbMgWV9TqXTgZ$m)2gv9^_|#j)*wVi|#$35c1u|A}Q;A}pAi2eK?a zKP6j9LD5zrFMs;~C>E{hxn)co)AO#ga!sFqiAiF*fh{}F^w&i!;xef@#i?AJnQ00o zsl_Dmy(-rDjSf;BMvj|TQXk_7^Ua$w~7WZNn zgXzodn1!boq_gr(?@wnInJnNfKV7zfg?IV^kfcK|P}zrK7RBjSbu8l36SP@brpuJD z7*1z>%pwAIM{Eg;?eueo5M}Js^Byv>2iqzE14aoPUZD5`fwW96P6dcRITcFtic?Dz zyd1+EUHqMa;y_8L8n6lw8&yeK=JZn~EK(APAcAW440iVdngI+XaXEA?T#nB1!J$sU YAsQgX?e|MqfS47C*|y&=VgHy40Q~*N{Qv*} delta 258 zcmbQgTmHgU`Gzfw+;Qz|;u(RM35c1uuZd@wDm=X^pG9T5z#&$S>9)66xu!c@VUn2M z@Q96f`sQL5>B%)R9Mc&~Sd6E47O+T64=4c=`wLivrq`9Q$V@9@VVSUN%lW2zm9iL4pU%f7INczVS!BAw8W!>C z=Sx{^!DdL5vB*yMO<>`l9#Y1lJAIomlfd+aWh}PBUXEdoF8%ET%nHP8+t-z|e@q1cUZ+)Y diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk index 6477ad71e8c..c23343a027e 100644 --- a/odk/CustomTarget_check.mk +++ b/odk/CustomTarget_check.mk @@ -36,7 +36,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \ $(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_config_win)) \ $(call gb_Package_get_target,odk_docs) \ $(call gb_Package_get_target,odk_html) \ - $(if $(ENABLE_JAVA),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \ + $(if $(JAVADOC),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \ $(call gb_Package_get_target,odk_settings) \ $(call gb_Package_get_target,odk_settings_generated) ifneq ($(gb_SUPPRESS_TESTS),) diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 16eba69c3e3..0d5fca58d2c 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -42,8 +42,10 @@ endif ifneq ($(ENABLE_JAVA),) $(eval $(call gb_Module_add_targets,odk,\ CustomTarget_classes \ - CustomTarget_javadoc \ - GeneratedPackage_odk_javadoc \ + $(if $(JAVADOC),\ + CustomTarget_javadoc \ + GeneratedPackage_odk_javadoc \ + ) \ GeneratedPackage_uno_loader_classes \ )) endif diff --git a/odk/util/check.pl b/odk/util/check.pl index be03d40ff58..bed51e1c7a6 100644 --- a/odk/util/check.pl +++ b/odk/util/check.pl @@ -184,7 +184,7 @@ if (-d "$SdkDir") { # improvement required my $solar_java = $ENV{"ENABLE_JAVA"}; my $JDK = $ENV{"JDK"}; - if (defined($solar_java) && $solar_java ne "" && (!defined($JDK) || $JDK ne "gcj")) { + if (defined($solar_java) && $solar_java ne "" && $ENV{"JAVADOC"} ne "") { print "check java docu: "; if (check_dir("docs/java/ref")) { if (!check_file("docs/java/ref/index.html")) { -- 2.30.2